framework/13-inch/intel-core-ultra-series1: revert #1358 (fix intel_vpu firmware error -2) #1568
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…tel_vpu firmware error -2)
Comment on lines
-40
to
-42
| warnings = lib.mkIf (!config.hardware.enableRedistributableFirmware) [ | ||
| ''For Intel NPU support, set the option: hardware.enableRedistributableFirmware = true;'' | ||
| ]; |
There was a problem hiding this comment.
This is still needed I think
There was a problem hiding this comment.
I don't think the warning is needed. I am suggesting to remove the warning for two reasons:
- This cleanly reverts framework/13-inch/intel-core-ultra-series1: revert #1358 (fix intel_vpu firmware error -2) #1568, without leaving any lines behind.
- A warning specifically about "NPU support" doesn't make sense anymore, as all the lines related to the Intel NPU Driver will be removed.
Note that enableRedistributableFirmware will still work as expected: if set to false, nixpkgs will not include linux-firmware (nor the NPU driver binaries that it now contains).
That said, it's just a warning. If there is a preference to keep all warnings that were previously present, then we can keep this one.
@JohnAZoidberg: Let me know how you'd like this to be resolved!
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes
This reverts #1358 (framework/13-inch/intel-core-ultra-series1: fix intel_vpu firmware error -2).
The firmware is now upstreamed to linux-firmware (https://web.git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/commit/?id=9b870dde196d030a6c8872e8965dd28a0146c990), so #1358 is no longer needed.
Right now, there is no impact to my proposed change (all this does is avoid downloading a file twice). However, it is better to use the upstreamed version in case the firmware gets updated in the future.
Things done
nixos-hardwareandimporting it via
<nixos-hardware>or Flake input